Remove optimization that was causing problems because we called

Thu Dec 27 15:45:41 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwidget.c (gtk_widget_set_style_internal):
	Remove optimization that was causing problems because
	we called gtk_widget_size_request() before we called
	gtk_widget_queue_resize() so RESIZE_NEEDED was not
	set. Optimization shouldn't mattter now that we
	are smart about needlessly size requesting or allocating
	widgets. (#67598, reported by Jacob Berkman)

diff --git a/ChangeLog b/ChangeLog
index 0200bdfe839de60dd875f9a24190fb2e76eaffda..52b73b827f0f3d1c5d7d3cc06cbb9725af464005 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Thu Dec 27 15:45:41 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_set_style_internal):
+       Remove optimization that was causing problems because
+       we called gtk_widget_size_request() before we called
+       gtk_widget_queue_resize() so RESIZE_NEEDED was not
+       set. Optimization shouldn't mattter now that we
+       are smart about needlessly size requesting or allocating
+       widgets. (#67598, reported by Jacob Berkman)
+
 Thu Dec 27 15:38:20 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb):

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0200bdfe839de60dd875f9a24190fb2e76eaffda..52b73b827f0f3d1c5d7d3cc06cbb9725af464005 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,13 @@
+Thu Dec 27 15:45:41 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_set_style_internal):
+       Remove optimization that was causing problems because
+       we called gtk_widget_size_request() before we called
+       gtk_widget_queue_resize() so RESIZE_NEEDED was not
+       set. Optimization shouldn't mattter now that we
+       are smart about needlessly size requesting or allocating
+       widgets. (#67598, reported by Jacob Berkman)
+
 Thu Dec 27 15:38:20 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0200bdfe839de60dd875f9a24190fb2e76eaffda..52b73b827f0f3d1c5d7d3cc06cbb9725af464005 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+Thu Dec 27 15:45:41 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_set_style_internal):
+       Remove optimization that was causing problems because
+       we called gtk_widget_size_request() before we called
+       gtk_widget_queue_resize() so RESIZE_NEEDED was not
+       set. Optimization shouldn't mattter now that we
+       are smart about needlessly size requesting or allocating
+       widgets. (#67598, reported by Jacob Berkman)
+
 Thu Dec 27 15:38:20 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb):

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0200bdfe839de60dd875f9a24190fb2e76eaffda..52b73b827f0f3d1c5d7d3cc06cbb9725af464005 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+Thu Dec 27 15:45:41 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_set_style_internal):
+       Remove optimization that was causing problems because
+       we called gtk_widget_size_request() before we called
+       gtk_widget_queue_resize() so RESIZE_NEEDED was not
+       set. Optimization shouldn't mattter now that we
+       are smart about needlessly size requesting or allocating
+       widgets. (#67598, reported by Jacob Berkman)
+
 Thu Dec 27 15:38:20 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0200bdfe839de60dd875f9a24190fb2e76eaffda..52b73b827f0f3d1c5d7d3cc06cbb9725af464005 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+Thu Dec 27 15:45:41 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_set_style_internal):
+       Remove optimization that was causing problems because
+       we called gtk_widget_size_request() before we called
+       gtk_widget_queue_resize() so RESIZE_NEEDED was not
+       set. Optimization shouldn't mattter now that we
+       are smart about needlessly size requesting or allocating
+       widgets. (#67598, reported by Jacob Berkman)
+
 Thu Dec 27 15:38:20 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0200bdfe839de60dd875f9a24190fb2e76eaffda..52b73b827f0f3d1c5d7d3cc06cbb9725af464005 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+Thu Dec 27 15:45:41 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_set_style_internal):
+       Remove optimization that was causing problems because
+       we called gtk_widget_size_request() before we called
+       gtk_widget_queue_resize() so RESIZE_NEEDED was not
+       set. Optimization shouldn't mattter now that we
+       are smart about needlessly size requesting or allocating
+       widgets. (#67598, reported by Jacob Berkman)
+
 Thu Dec 27 15:38:20 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0200bdfe839de60dd875f9a24190fb2e76eaffda..52b73b827f0f3d1c5d7d3cc06cbb9725af464005 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+Thu Dec 27 15:45:41 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_set_style_internal):
+       Remove optimization that was causing problems because
+       we called gtk_widget_size_request() before we called
+       gtk_widget_queue_resize() so RESIZE_NEEDED was not
+       set. Optimization shouldn't mattter now that we
+       are smart about needlessly size requesting or allocating
+       widgets. (#67598, reported by Jacob Berkman)
+
 Thu Dec 27 15:38:20 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb):

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 10f6241f1a90233d4ad231bc446ec1cc4864291f..e4b034b009f37eb646cfee2b405db724521adb61 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -4165,18 +4165,7 @@ gtk_widget_set_style_internal (GtkWidget *widget,
       g_object_unref (previous_style);
 
       if (widget->parent && !initial_emission)
-       {
-         GtkRequisition old_requisition;
-         
-         old_requisition = widget->requisition;
-         gtk_widget_size_request (widget, NULL);
-         
-         if ((old_requisition.width != widget->requisition.width) ||
-             (old_requisition.height != widget->requisition.height))
-           gtk_widget_queue_resize (widget);
-         else if (GTK_WIDGET_DRAWABLE (widget))
-           gtk_widget_queue_clear (widget);
-       }
+       gtk_widget_queue_resize (widget);
     }
   else if (initial_emission)
     gtk_signal_emit (GTK_OBJECT (widget),